(composition_compute_stop_pos): Reset cmp_it->id to -1 at first.

diff --git a/src/ChangeLog b/src/ChangeLog
index b8333c6bb25248639d3278663ec16d3d9bde91c8..13f878766df4fdbd66ffd2b6a2781b7d23cbf6b7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,7 @@
        compose a grapheme cluster with the preceding base glyph.
 
        * composite.c (composition_compute_stop_pos): Fix previous change.
+       Reset cmp_it->id to -1 at first.
 
 2008-09-10  Glenn Morris  <rgm@gnu.org>
 

diff --git a/src/composite.c b/src/composite.c
index be9871eef398f2cc178c605ff121b826568d215a..92e7a1e44cb9056674083c14b4244e96a55d6a33 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -1000,6 +1000,7 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string)
   if (endpos > charpos + MAX_NEWLINE_DISTANCE)
     endpos = charpos + MAX_NEWLINE_DISTANCE;
   cmp_it->stop_pos = endpos;
+  cmp_it->id = -1;
   cmp_it->ch = -2;
   if (find_composition (charpos, endpos, &start, &end, &prop, string)
       && COMPOSITION_VALID_P (start, end, prop))